[gdk] Remove gdki18n.h completely

diff --git a/docs/reference/gdk/gdk-sections.txt b/docs/reference/gdk/gdk-sections.txt
index 98d32ba639e1f907b1e28ab28ca15f263e963293..b25cebaa9fb1615df02fe60fcb3b8798a9ea2a4a 100644 (file)
--- a/docs/reference/gdk/gdk-sections.txt
+++ b/docs/reference/gdk/gdk-sections.txt
@@ -1330,8 +1330,6 @@ gdk_x11_get_xatom_name_for_display
 gdk_display
 GDK_HAVE_WCHAR_H
 GDK_HAVE_WCTYPE_H
-gdk_iswalnum
-gdk_iswspace
 </SECTION>
 
 <SECTION>

diff --git a/gdk/Makefile.am b/gdk/Makefile.am
index 1a783c370aa530c4255b63b9d0cac3f1dfcc9f69..70248a46416cdb4eb8f7d4213c8dd6c16695183d 100644 (file)
--- a/gdk/Makefile.am
+++ b/gdk/Makefile.am
@@ -84,7 +84,6 @@ gdk_public_h_sources =                                \
        gdkevents.h                             \
        gdkfont.h                               \
        gdkgc.h                                 \
-       gdki18n.h                               \
        gdkimage.h                              \
        gdkinput.h                              \
        gdkkeys.h                               \

diff --git a/gdk/gdki18n.h b/gdk/gdki18n.h
deleted file mode 100644 (file)
index 9e70be0..0000000
--- a/gdk/gdki18n.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* GDK - The GIMP Drawing Kit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GDK_I18N_H__
-#define __GDK_I18N_H__
-
-#ifndef GDK_DISABLE_DEPRECATED
-
-/* GDK uses "glib". (And so does GTK).
- */
-#include <glib.h>
-#include <gdkconfig.h>
-
-/* international string support */
-
-#include <stdlib.h>
-
-#if !defined(GDK_HAVE_BROKEN_WCTYPE) && (defined(GDK_HAVE_WCTYPE_H) || defined(GDK_HAVE_WCHAR_H)) && !defined(X_LOCALE)
-#  ifdef GDK_HAVE_WCTYPE_H
-#    include <wctype.h>
-#  else
-#    ifdef GDK_HAVE_WCHAR_H
-#      include <wchar.h>
-#    endif
-#  endif
-#  define gdk_iswalnum(c) iswalnum(c)
-#  define gdk_iswspace(c) iswspace(c)
-#else
-#  include <ctype.h>
-#  define gdk_iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
-#  define gdk_iswspace(c) ((wchar_t)(c) <= 0xFF && isspace(c))
-#endif
-
-#endif /* GDK_DISABLE_DEPRECATED */
-
-#endif /* __GDK_I18N_H__ */

diff --git a/gdk/makefile.msc b/gdk/makefile.msc
index ded0aa277d4e2aa4de0e186200cc3989af095249..4599fb9eff6a789f7912576473388b1fc13e29e6 100644 (file)
--- a/gdk/makefile.msc
+++ b/gdk/makefile.msc
@@ -108,7 +108,6 @@ gdk_public_h_sources = \
        gdkfont.h       \
        gdkgc.h         \
        gdkkeysyms.h    \
-       gdki18n.h       \
        gdkimage.h      \
        gdkinput.h      \
        gdkkeys.h       \

diff --git a/gdk/quartz/gdkim-quartz.c b/gdk/quartz/gdkim-quartz.c
index c602ecc2be452829cb87f4d7f71b1f78c577019f..a3382449a09dc57a7f8dd8896ad735308a89750f 100644 (file)
--- a/gdk/quartz/gdkim-quartz.c
+++ b/gdk/quartz/gdkim-quartz.c
@@ -28,7 +28,6 @@
 
 #include <locale.h>
 
-#include "gdki18n.h"
 #include "gdkinternals.h"
 #include "gdkprivate-quartz.h"
 

diff --git a/gdk/win32/gdkim-win32.c b/gdk/win32/gdkim-win32.c
index b621721f5416940d6fce4fc9b9967bbb8883034f..3f038e03154b3e3f71be4c55ed950eb9e2ac05b5 100644 (file)
--- a/gdk/win32/gdkim-win32.c
+++ b/gdk/win32/gdkim-win32.c
@@ -33,7 +33,6 @@
 
 #include "gdkpixmap.h"
 #include "gdkinternals.h"
-#include "gdki18n.h"
 #include "gdkwin32.h"
 
 gchar*